Extract shared methods from duplicated block logic#33
Merged
Conversation
The same ~12-line power-pulling loop was duplicated in CobblestoneFactory, ObsidianFactory, SmallDrill, and AutoSmelter. Move it to a shared protected method in PowerBlock and replace all four copies.
The same 3-line method was duplicated in PowerCable, PowerSplitter, PowerMerger, and AutoSmelter. Move it to a shared protected method in PowerBlock and remove all four private copies.
The same 6-element BlockFace list was defined in CobblestoneFactory, ObsidianFactory, LavaGenerator, and FluidPump. Move it to AtlasBlock companion and remove all four private copies.
Add a polymorphic canProvideFluid(requestDirection) method to FluidBlock, with overrides in FluidPump and FluidContainer that delegate to canRemoveFluidFrom(). This replaces the when(source) type dispatch duplicated across FluidPipe, FluidMerger, FluidContainer, CobblestoneFactory, ObsidianFactory, and LavaGenerator.
…BlockDialog Add createNoticeDialog() to centralize the close-button + notice dialog pattern duplicated in FluidBlockDialog, TransportBlockDialog, and PowerBlockDialog. Add BlockFace.displayName() extension to replace 8 occurrences of the same formatting logic across dialog classes.
…d related classes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
pullPowerFromNeighbors()andupdatePoweredState()intoPowerBlock, removing duplicated implementations from 4 utility/power blocks eachADJACENT_FACESconstant toAtlasBlockcompanion, removing 4 private copiescanProvideFluid(requestDirection)toFluidBlockwith overrides inFluidPumpandFluidContainer, replacing 6when(source)type-dispatch blockscreateNoticeDialog()andBlockFace.displayName()toAtlasBlockDialog, simplifying all 3 dialog classesNet result: -319 lines across 19 files, no behavior changes.